Autogenerated HTML docs for v1.7.4.1-225-g83c3c
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index ce97130..f19f6a3 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html
@@ -421,6 +421,44 @@ <div class="paragraph"><p>Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit).</p></div> +<div class="paragraph"><p>When it is not obvious how to apply a change, the following +happens:</p></div> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +The current branch and <tt>HEAD</tt> pointer stay at the last commit + successfully made. +</p> +</li> +<li> +<p> +The <tt>CHERRY_PICK_HEAD</tt> ref is set to point at the commit that + introduced the change that is difficult to apply. +</p> +</li> +<li> +<p> +Paths in which the change applied cleanly are updated both + in the index file and in your working tree. +</p> +</li> +<li> +<p> +For conflicting paths, the index file records up to three + versions, as described in the "TRUE MERGE" section of + <a href="git-merge.html">git-merge(1)</a>. The working tree files will include + a description of the conflict bracketed by the usual + conflict markers <tt><<<<<<<</tt> and <tt>>>>>>>></tt>. +</p> +</li> +<li> +<p> +No other modifications are made. +</p> +</li> +</ol></div> +<div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such +conflicts.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> @@ -684,7 +722,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-02-10 02:03:21 UTC +Last updated 2011-03-10 01:17:52 UTC </div> </div> </body>
